<?php
// +----------------------------------------------------------------------
// | ThinkPHP [ WE CAN DO IT JUST THINK ]
// +----------------------------------------------------------------------
// | Copyright (c) 2006~2016 http://thinkphp.cn All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: liu21st <liu21st@gmail.com>
// +----------------------------------------------------------------------
<<<<<<< HEAD


use think\Route;


Route::get('/personal/:id','personal/index/delete');
Route::get('/personal','personal/index/index');
<<<<<<< HEAD
Route::get('/follow/:id','personal/follow/delete');
Route::get('/follow','personal/follow/index');
Route::get('/article','personal/article/index');

return [
    '__pattern__' => [
        'name' => '\w+',
    ],
    '[hello]'     => [
        ':id'   => ['index/hello', ['method' => 'get'], ['id' => '\d+']],
        ':name' => ['index/hello', ['method' => 'post']],
    ],

];
=======
>>>>>>> c89741c9756c88ff21484962c21fdf69316382c1
=======
use think\Route;
//return [
//    '__pattern__' => [
//        'name' => '\w+',
//    ],
//    '[hello]'     => [
//        ':id'   => ['index/hello', ['method' => 'get'], ['id' => '\d+']],
//        ':name' => ['index/hello', ['method' => 'post']],
//    ],
//
//];
// Route::post('/add','index/Index/add');
Route::get('/index','index/Index/index');
Route::resource('add','index/Index/save');
Route::post('/sign','index/Index/sign');
Route::get('/log','index/Index/log');
>>>>>>> f7ff0be6c30987dc092991254b9df280e9ffeef4
